Correctly generate def files again

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 6adaa7ac5c88d7b256e0811e85a3c4858d4e85e4..d52fdd292b2d1414987af6bc3c0ec46016670e41 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -194,8 +194,8 @@ endif # USE_QUARTZ
 if USE_WIN32
 libgdk_3_la_SOURCES += gdkkeynames.c
 libgdk_3_la_LIBADD += win32/libgdk-win32.la
-libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
-libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
+libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
+libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
 endif # USE_WIN32
 
 if USE_BROADWAY
@@ -346,9 +346,13 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # HAVE_INTROSPECTION
 
 if OS_WIN32
+gdk.def: libgdk-3.la
+       echo "LIBRARY libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@
+       echo "EXPORTS" >>$@
+       objdump -p .libs/libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
 install-def-file: gdk.def
        mkdir -p $(DESTDIR)$(libdir)
-       $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
+       $(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
 uninstall-def-file:
        -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def
 else

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 1d4b6247dbc2056be1468742e338d1451f918bde..f9747235502f4306b3b2b55191bf116ef326b519 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -88,8 +88,13 @@ gtk_win32_res_ldflag = -Wl,gtk-win32-res.o
 gtk-win32-res.o : gtk-win32.rc
        $(WINDRES) gtk-win32.rc $@
 
+gtk.def: libgtk-3.la
+       echo "LIBRARY libgtk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@
+       echo "EXPORTS" >>$@
+       objdump -p .libs/libgtk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
+
 install-def-file: gtk.def
-       $(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-3.0.def
+       $(INSTALL) gtk.def $(DESTDIR)$(libdir)/gtk-win32-3.0.def
 uninstall-def-file:
        -rm $(DESTDIR)$(libdir)/gtk-win32-3.0.def
 else
@@ -1479,8 +1484,8 @@ if USE_WIN32
 win32_theme=yes
 libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
 libgtk_3_la_LDFLAGS += -Wl,-luuid
-libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
-libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
+libgtk_3_la_DEPENDENCIES += $(gtk_win32_res) $(deps)
+libgtk_target_ldflags = $(gtk_win32_res_ldflag)
 endif
 
 install-exec-hook:

diff --git a/libgail-util/Makefile.am b/libgail-util/Makefile.am
index 4e9c192c50cc756b9ea3bcb406fb805fc7208710..9422f8a27ea02867a23ab44432431cb1e85067eb 100644 (file)
--- a/libgail-util/Makefile.am
+++ b/libgail-util/Makefile.am
@@ -6,8 +6,12 @@ no_undefined = -no-undefined
 endif
 if OS_WIN32
 export_symbols = -export-symbols $(srcdir)/gailutil.def
+gailutil.def: libgailutil-3.la
+       echo "LIBRARY libgailutil-$(GTK_MAJOR_VERSION)-$(GAIL_LT_CURRENT_MINUS_AGE)" >$@
+       echo "EXPORTS" >>$@
+       objdump -p .libs/libgailutil-$(GTK_MAJOR_VERSION)-$(GAIL_LT_CURRENT_MINUS_AGE).dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
 install-def-file: gailutil.def
-       $(INSTALL) $(srcdir)/gailutil.def $(DESTDIR)$(libdir)
+       $(INSTALL) gailutil.def $(DESTDIR)$(libdir)
 uninstall-def-file:
        -rm $(DESTDIR)$(libdir)/gailutil.def
 else
@@ -71,7 +75,6 @@ libgailutil_3_la_LIBADD = \
 libgailutil_3_la_LDFLAGS = \
        -version-info $(GAIL_LT_VERSION_INFO)   \
        $(no_undefined)                         \
-       $(export_symbols)                       \
         $(LDFLAGS)
 
 gailutil.lib: libgailutil-3.la gailutil.def